Don't bind GDK_Page_Up and GDK_Page_Down twice. (#168333, Hazael Maldonado

2005-05-16  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkscale.c (gtk_scale_class_init): Don't bind GDK_Page_Up
	and GDK_Page_Down twice.  (#168333, Hazael Maldonado Torres)

diff --git a/ChangeLog b/ChangeLog
index 36ba87a51bd18b789906503affaced0d2578050b..2ea360de3330767a94e68378b805f21bf8fc6aab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
 2005-05-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkscale.c (gtk_scale_class_init): Don't bind GDK_Page_Up 
+       and GDK_Page_Down twice.  (#168333, Hazael Maldonado Torres)
+
        * gtk/gtkentry.c (cursor_blinks): Don't blink the cursor if 
-       the entry is not editable.  (#304171,Nikos Kouremenos)
+       the entry is not editable.  (#304171, Nikos Kouremenos)
        
        * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): 
        Make sure the action of the button and the dialog are in sync,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 36ba87a51bd18b789906503affaced0d2578050b..2ea360de3330767a94e68378b805f21bf8fc6aab 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,7 +1,10 @@
 2005-05-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkscale.c (gtk_scale_class_init): Don't bind GDK_Page_Up 
+       and GDK_Page_Down twice.  (#168333, Hazael Maldonado Torres)
+
        * gtk/gtkentry.c (cursor_blinks): Don't blink the cursor if 
-       the entry is not editable.  (#304171,Nikos Kouremenos)
+       the entry is not editable.  (#304171, Nikos Kouremenos)
        
        * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): 
        Make sure the action of the button and the dialog are in sync,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 36ba87a51bd18b789906503affaced0d2578050b..2ea360de3330767a94e68378b805f21bf8fc6aab 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,7 +1,10 @@
 2005-05-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkscale.c (gtk_scale_class_init): Don't bind GDK_Page_Up 
+       and GDK_Page_Down twice.  (#168333, Hazael Maldonado Torres)
+
        * gtk/gtkentry.c (cursor_blinks): Don't blink the cursor if 
-       the entry is not editable.  (#304171,Nikos Kouremenos)
+       the entry is not editable.  (#304171, Nikos Kouremenos)
        
        * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): 
        Make sure the action of the button and the dialog are in sync,

diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 7a73da86012fce80457cb1889c4deb7cb2570c5f..e3abc94b4cbe6fd2e0976bcf9f9d6b28014b172a 100644 (file)
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -266,10 +266,10 @@ gtk_scale_class_init (GtkScaleClass *class)
   add_slider_binding (binding_set, GDK_KP_Down, GDK_CONTROL_MASK,
                       GTK_SCROLL_PAGE_DOWN);
    
-  add_slider_binding (binding_set, GDK_Page_Up, 0,
+  add_slider_binding (binding_set, GDK_Page_Up, GDK_CONTROL_MASK,
                       GTK_SCROLL_PAGE_LEFT);
 
-  add_slider_binding (binding_set, GDK_KP_Page_Up, 0,
+  add_slider_binding (binding_set, GDK_KP_Page_Up, GDK_CONTROL_MASK,
                       GTK_SCROLL_PAGE_LEFT);  
 
   add_slider_binding (binding_set, GDK_Page_Up, 0,
@@ -278,10 +278,10 @@ gtk_scale_class_init (GtkScaleClass *class)
   add_slider_binding (binding_set, GDK_KP_Page_Up, 0,
                       GTK_SCROLL_PAGE_UP);
   
-  add_slider_binding (binding_set, GDK_Page_Down, 0,
+  add_slider_binding (binding_set, GDK_Page_Down, GDK_CONTROL_MASK,
                       GTK_SCROLL_PAGE_RIGHT);
 
-  add_slider_binding (binding_set, GDK_KP_Page_Down, 0,
+  add_slider_binding (binding_set, GDK_KP_Page_Down, GDK_CONTROL_MASK,
                       GTK_SCROLL_PAGE_RIGHT);
 
   add_slider_binding (binding_set, GDK_Page_Down, 0,